bitkeeper revision 1.1277.1.3 (425aec46dvifSfLa2Hv830iDr8hA2A)

Merge fixups

diff --git a/xen/arch/ia64/acpi.c b/xen/arch/ia64/acpi.c
index 7148da364da39f9def3825334b6543dcaea9e6f9..c49371537ae83c667bf74030c30115dcd0aff6d5 100644 (file)
--- a/xen/arch/ia64/acpi.c
+++ b/xen/arch/ia64/acpi.c
@@ -57,7 +57,7 @@ int acpi_ioapic = 0;
    -------------------------------------------------------------------------- */
 
 #ifdef CONFIG_ACPI_BOOT
-int acpi_noirq __initdata = 0;  /* skip ACPI IRQ initialization */
+//int acpi_noirq __initdata = 0;  /* skip ACPI IRQ initialization */
 int acpi_ht __initdata = 1;     /* enable HT */
 
 enum acpi_irq_model_id         acpi_irq_model;

diff --git a/xen/arch/ia64/patch/linux-2.6.11/types.h b/xen/arch/ia64/patch/linux-2.6.11/types.h
index b365ab51659c366ae6b97fada909ca7b9d1ae09a..9cf610326b8951096e0f1826342ca9ec9ee35439 100644 (file)
--- a/xen/arch/ia64/patch/linux-2.6.11/types.h
+++ b/xen/arch/ia64/patch/linux-2.6.11/types.h
@@ -1,10 +1,5 @@
- types.h |    7 +++++++
- 1 files changed, 7 insertions(+)
-
-Index: linux-2.6.11/include/asm-ia64/types.h
-===================================================================
---- linux-2.6.11.orig/include/asm-ia64/types.h 2005-03-02 01:37:49.000000000 -0600
-+++ linux-2.6.11/include/asm-ia64/types.h      2005-03-19 14:58:47.628750770 -0600
+--- ../../linux-2.6.11/include/asm-ia64/types.h        2005-03-04 10:26:30.000000000 -0700
++++ include/asm-ia64/types.h   2005-04-11 15:23:49.000000000 -0600
 @@ -1,5 +1,12 @@
  #ifndef _ASM_IA64_TYPES_H
  #define _ASM_IA64_TYPES_H
@@ -18,3 +13,32 @@ Index: linux-2.6.11/include/asm-ia64/types.h
  
  /*
   * This file is never included by application software unless explicitly requested (e.g.,
+@@ -61,6 +68,28 @@
+ typedef __s64 s64;
+ typedef __u64 u64;
+ 
++#ifdef XEN
++/*
++ * Below are truly Linux-specific types that should never collide with
++ * any application/library that wants linux/types.h.
++ */
++
++#ifdef __CHECKER__
++#define __bitwise __attribute__((bitwise))
++#else
++#define __bitwise
++#endif
++
++typedef __u16 __bitwise __le16;
++typedef __u16 __bitwise __be16;
++typedef __u32 __bitwise __le32;
++typedef __u32 __bitwise __be32;
++#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
++typedef __u64 __bitwise __le64;
++typedef __u64 __bitwise __be64;
++#endif
++#endif
++
+ #define BITS_PER_LONG 64
+ 
+ /* DMA addresses are 64-bits wide, in general.  */